build: Do not force inclusion of gtk.h

GCC will not do the right thing, and it will just break the build when
trying to include gtk.h first.

We'll have to live with the warning from the compiler about a missing
gtk_init() — though it would be better not to have to init GTK at all to
generate the introspection data.

This commit unbreaks the build in GNOME Continuous introduced by commit
6838861d26bfec9af53438022bd1f5b60bab3bf4.

diff --git a/gtk/Makefile.am b/gtk/Makefile.am
index 506e17185d8a224a38292d6ab71ba823afd1c08b..5dcf1a5aa66a231cfc5b7e81482d9af150c187cc 100644 (file)
--- a/gtk/Makefile.am
+++ b/gtk/Makefile.am
@@ -1366,7 +1366,7 @@ introspection_files += \
 endif
 
 include $(INTROSPECTION_MAKEFILE)
-INTROSPECTION_SCANNER_ENV = CC="$(CC)" CPPFLAGS="-I$(top_srcdir) -I$(top_builddir) -I. -include gtk.h"
+INTROSPECTION_SCANNER_ENV = CC="$(CC)"
 INTROSPECTION_COMPILER_ARGS = \
        --includedir=$(srcdir) \
        --includedir=. \